(smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Reiner.Steib...

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 7efe1e6ff080f3508d9b7108015e2baf93685441..7175ec2c40db81f5eb3f1a37fbea4dd7de6ea8bd 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1228,7 +1228,8 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
 If no conflict maker is found, turn off `smerge-mode'."
   (smerge-mode 1)
   (condition-case nil
-      (smerge-next)
+      (unless (looking-at smerge-begin-re)
+        (smerge-next))
     (error (smerge-auto-leave))))
 
 (provide 'smerge-mode)